restored to pre-remake level of functionality