fixes logic problem and body adding