Corrected design errors