Second checkin
more modifications