Update according to #3 comments