might need this after changing control handler