adding preloader
merging conflicts