Changed to static system