updated after comments