needs async to work properly
add lint fixes