checked out updated REMADE from master