Added stuff from Pastor D