adjusting the changes and adding some docs