#45 No need for pre-component now