paginatn removed , other chnages done