Changes after PR