Remove components form master
Add scaling and change animatio time
Merge
Add components