Added dev logging to help debugging