commit to newb by first dev
merge changes in newb