Adding plang's stuff