Last context fixes. Enter in testing stage