added preloader
merge