adding a few missing pieces