Changes were made on the property replacement

Tests not done yet