Updated to 4.0

- Updated to 4.0.0.44
- Complete Redesign of Code