updated after saturday session with jasmine testing