New version

Changes by jonnybazookatone reflected.