added catch and thow mechanics