tweaking for Emma
resolved conflicts I think
fixed?