replacements and minor changes!