first commit from phangji's mac