working v1 without editing