major overhaul, looks better