Adding IceWall changes