upgraded to 1.1
refactor