Modify for lion2...