Tried to make some changed with new forms