modifying things to be compatible with work space env