merge a bit with Sun version