GUI-380
refactored into 2 tweens