Reconfigured project, added debug logs