Finished basic upgrade - 100% coverage