Updated after PR comments