updated the copyright
check for property before they are being used in objects