added switch modes and solar cells