Design improved and completed