a bit more improvments