Second commit from noah's comp