Added logging. :/