Battle with delete - Must fix later
Fixes