Enable controller (4/31)

Enable controller