updating to make it more backward compatible