Now with start swtich working