Added collision mechanics