improvements when working under build