Bug fixes and Different switch