had to revert back to 1.0.3, too many changes and lost track