Some changes made while doing extra credit