trying to make this more backward compatible