Changing a few methods to be virtual