adding stuff from previous version