removed boilerplate thanks to new feature