add more cases
update style