Rework done on oops assignment with Old code maintained