removed trap - added second version