Lots of methods added