adding stuff missing from last commit