First commit back of changes