added commits from keitoAtZ