cleaned up storgie for queueing take 2