Added handling with scoring