altered delete and setup