Made updates after bad merge