Trying to improve the overal quality