checdnges are made to make it morwe comfrtable

merging the branch with master its fine