Modify for lion3...