First attempt to fix genwei items 1) and 2)