move management form out of condition