rebase:add 2 methods