Moved call of rawoutput to appropriate place