added some catches becuase it was messing up