merging branches again to work on final spoofing