Made changes to allow scaling