glance state and module final fix