Changes made according to the code review, More partial forms added working correct