Major Rework to be even more stable and easier to maintain