modify is working now, still buggy