More design - finalizing