Fav improvments2