Properties working better now