@MrZYX Are these changes appropriate?