Added some final touches