v1.1a testing
- cleaner code