Hopefully fixed project for real this time