update to include new componnets