plugin changes and others