changed to make backwards compatible