adjusted for apache