Updated scaleable component