More improvements to version 1.1