Changed from variabels to object properies