New: improvments