added andrew changes