final changes, now let's try to make it work at imperial