moved some checks and actions to provision