updated changes

Updated changes so it can be submitted to SLE12