added stuff for Emma