Removed set! as much as possible