added reset stuff
Merge branch 'divie_front'