Updated for Koganei