Squash to one commit - Lily - Oct 5.

This time it looks working