Redone correctly , structure, its pretty