updated with new methods