fixed adrians changes