Some changes to form