Added ability to handle changes to Prop List
Changed variable names to avoid confilcts