updated to include new files and recent changes