Updated with StudyBuddy code