adjusted design Issue #488