Final update to desgin