added dock and collision