Updated version Remove needs Work