I updated this a little.