version 2.1.1 - working