added proper time switch controls