clearing up some weird errors that were previously found
new version