modified lineagini component to be cleaner