why remove the constants if we are using them here anyways ? :/