build fixed,
standalone still buggy