Making a commit before I cry, Sahar was here