adding everything before I forget