optimized & 34 added