some stuff added. PROBLEM with collision