Less slow, but one bug