Yamamoto/modify preview