Some refact.
Bump 1.1