commit 2 from lion