version 1.2 - big improvments