updated for body and components