Commit by thilina and dineth