Improvements of Code, Better performance