Basic build
Updated from upstream