change some code to accomodate contol's changes