Riya: First Commit(All tests done)