Fixed for 1957+20 Output
In progress