Added final functionalities but with frequent collisions