more behaviour changes
correction to previous