debugging avi's changes