Mac's changes