Finalised workaround, and added control center.