Dev

Tested and works stable.