updated through forms editing (part 1)