Functional collision + minor changes