Some changes I made a while ago