Added optimized and non optimized