added extended logging