Updated after comments