update res from branch jimi
update res from branch jimi