Some suggested changes, testing to follow