Added Functionality to FFSW & OSSW