More tweaking, but not great atm