Suggestion for improvements

Package: Gates (wider)