merge in to dev and readjust