started making edits to make 3.0 version