updated to 2.1.2 and made everything components