Updated to reflect most recent changes to repos and release