feature 1030 un-samoura-