Remixes of "prop assets again"

Feedback