Cleaned up and expanded POD