bringing module up to current standards