Updated build and emulate