updated old behaviors a bit