Address design pass issues #23