18-6-23 update