updated framework with fixes