tweaks to make it work with component