Updated to 2.6.1 + few changes