Z6: fix 2a, solve 2b