adding tested improvements