stripping down and minor changes