jimmys version of new.py
resolved conflicts