Adding the final touches