V1.0 with bug fixes