Updating to add new methods from Chris