Version 15

With cleaned code