ALL :: minor changes