Working on first optimizations in the system