more conversions to modules