Implement Avi's changes