my optimizations/changes