cleaned up storgie for queueing