removed dupe module and changed order