Cleanup and added another render