Trimmed code, added info