Updated custom build