Still looks like crap, but nicer crap