Removed use of six module