Add extra logging for DEMO purposes ONLY