nbd - and be careful with amend after push to master