Made Changes To Be Apple Ready. Round 2.