Revert to 1.0.3 for update
Restructure code
note to self