Looks better, still working