Adding some final touches