Updated to fit NE requirements also