Added Some logging