enhance header design implementation, #22