move standalone to controller