To improve the current implementation