fixing according to new comments