more stuff request pull into djowens repo