check out design improovements and forwarded to fred. waiting for feedbacks