12.16 sorted out