Remixes of "dasiy 2 fixes"

Feedback