Build 4: some fixed