Add some methods, make in better