Final stuff for initial test run