COde updated for q3