more updates and new methods