now added everything important