Build 5, some fix