Updated project with more debugging