Reordered inputs, and removed unused module.