Initial commit of changes form the original