updated with a complete design