fixed Tims stuff