added stuff from 1st year