Adding some more final touches