Some changes and a button