everything works about to merge to master