update 17-12-14