added sequence info
fixed merge conflict because jeff was an idiot