Mayumi's changes and fix to thin site for no info.