Adding changes I have made at work.