AES added tools to main loop