reorganize
update option
doesn't exactly deal yet