finished version 1.1