some additions here and there