Added a change to allow code to function