improvement for further usage possibilities