updated with changes
updated comments