Seris of changes made just trying to get this thing on the right track