Little changes for improving the performance