new changes from dev kryz and jemo