changing logic, for backwards compatability