working version 1.1.3