commit done on 10-12-14