working version 1.2.1