updating from gem-sw