Some final tweaks and its good enough to present