changed properties + added better logging