More flexible options updated on the contorlling side