Updated, testing switch again