finally working version 1.1