Updates to advanced mode. (Increasing speed, abstraction of some methods)