added full scaling