shuffled around the properties code