added martin and me, removed ramzi