More Improvments