added more variables to components