did some awesome stuff refs #6