FINAL PUSH FOR VERSION 1.1