fixed 'over-dev'ed architecture