Made some changes to the code in best features