New repo, should have resolved issues