emily tested and I bugfixed