Make these two methods as same as possible