modifications :)
removing cruft
cccchanges