changed module order