added "[-]" optimization & set up for further optimizations