Added state scaling