add final changes including plug ins