Fixed looping, started refilling properties