added @tuturto sugesstions