Updated solution format