Changes I did not want to put on this branch