Revamped collision architecture