Reworking execution order to make it more simple.