cleaned up now mode