Pushed changes to work on laptop.