Add final touches