working on updated framework