More changes until I get the form I wish for