Little changes to form