Updates by Japmor