Add some scale conditions

Title says it all

Merging