bringing this module up to date