worked ver 1.1