Minor updates
switched to no transition by default