Slight modifications
Don't print queue