Better, but still not working as expected.