Implemented Chris's changes for him. Because he is lazy.