All solved (almost)