switched up the dundles a bit. removed some old code