use case specific modifications and a minor fix