deleted logic in catch block + new version