commiting changes from Venelin