added controller check back in