Added more final touches