Final working version 1.1