Added back code that was removed