added stuff from 247 application