Added final touches