Made some optimizations

Update[12.26.14.12.44]