added stuff from 'dev'