Updated for my machine