Changed module order