Initial commit for fix3stage