changes as per Damjan