Changed internal controller to external