Smart Move Properties

@smart-move