re build form #18