Some moves and IP fix