starting new changes
finished adding search and last changes
starting last details