MAC: Updated logic