Some changes. Saving not yet implemented