For Demo. Polished some stuff up