Should be fully working again, MAC search not implemented