updated to 5.2 module style