Added Replace-Dummies
minor changes