Changed signatures, added additional methods.