Finally added the final touches