more work - still unstable