new methods and fixes