replacin comments etc etc cleaning up