Additional improvements

2024