20131213 mod by norita