Added methods, etc