Incorporated recommendations from @hujie5592427. Thanks @hujie5592427!