Added new methods, need to refactor