bringing this module a bit more up-to-date