Removed all of the hacks & adjusted when we commit to do so on any change in the data (Issue #91)