changes as per talking with Orly