Made a few changes since my last post