major revamp in framework