rebuild, with working arguments...