Changed to static access, added default case.