updated legolas/theodan