Added scales. Refactoring