updates as per requests etc