Rebuild of COSC2425