big update for v1.1