Improvement to shapes and collision