improved: only one formula