Made Lots of changes to claming system