Lots of changes to try things