Recompiled build with changes from new_york branch