made control shorter, added loc