[UPDATE] major simplifications
[UPDATE] testing 2.1.5