changed to correct way