minor changes - night - 16/7