Now supports scaling