Updated definitions, added control output to switch statement.