edited from MacBook