Updated all of detail design