updated to include scale