rewrite Maker file in a more health way