Updated. test more methods.