new comments and switch statement