Made some changes to make debugging easier