Update logic according issue #14 comments