Updated stuff for testing session