updated stuff working with neta and ronen