Work on version 1.1