Changes from Marco Arment