final version 1.1, few tweaks