seems much less wonky but probably needs the factors tuning