changed some user behaviour, not finished