some changes 16:03