Switch added and comments