Move few things around to make more sense

disabling apply until update is done