started to adapt to version 1.1