Changed the way components are working