Improved version of offer controller