General D-17 Re-write

General D-17 Re-write