Refactored and added scale factors