now working on deactivated