Improve overall behaviour