Restored to scott's version