added shimpe improvements