Added Matt's changes