fixing some missing pieces