Some minor changes. We need to discuss some implementation stuff on
Monday