Updated q02, incomplete