Updated PR

Excluding comments