Simplified system MAC logic further