Modifiying some things for build 1