can no longer stick to walls
merge master