Further improvments