Fixed 08-12-14-0001

+ Optimizations