first commit.
Fixed other methods. they not return nil now.