revised for static