Initial Commit of changed code