fixed form and added wk7