More improvments