Beta 2

Improved feature