v 1.7 need clean