Edited codes for PR