Code

updates from Lucas and Colin