Form Logic 2 updates