Apply same changes as explained above