Add collision-detection