UPDATED: Eluna
add check for unit