update 8-12 21:20