I think i added everything