Vinay, Sush | Performance fix