Update with recent additions
Update scaling