framework renewed
bug fixes