Builder style modified