Custom improvements