form 477 improvements #6499