ver 1.0 fixed