Added new methods, updated code