pulled some files, made some modifications