Some improvement

:+1:  i completely forgot about this