Final changes for PR