added csw stuff