new changes as per lint