Dev

Updates after review.