Frame Work Update

reduced uneccessary abstraction