hopefully fixed Emily

's bug and added new methods