Updated to build 501 and fixed merge conflicts