Added deletion check, tested