redo this and keep everything in its place