updated for high mass stuff