changed some interaction