Edited framework and added probes