commited
Logic done