post-LD30 commit, unstable