Copy accross from wpthumb branch