Changed scheduler to switch table format