Addressed comments

bla