more improvments