Fix issue #246 added skin choice but still need some cleaning