Working on version 1.0.7