merged from style and temp_yl branch