Changed implementation order

Updated implementation order to be according to development.