more changes for behaviour