Edits by b8713ka