* Reworked the internals to improve performance and speed