edited form some more