Made change backwards compatible