Simplified, changed, added info