Rough Checked changes

Need to check in compiler