Re-working layout scheme