Updated to suit my config