Made some changes for our needs.