Standalone build working