Making module work in 6