Some updates before I pull to AS Mac