done w version 1.0