Still needs removal fixed