updated with fswin