last round of adding stuff ?