Donysa Pull Request 7/15

merging some changes with JNB changes