added WG support
added new files