lots of changes
merged with Jerry's overide changes