New method & bug fix