debugged the latest additions