almost done changes as per dads request