Working somewhat better