changes for a faster code