Aliasing
Fix aliasing

Yea it's overkill. but took forever to get it