Re-edited team code , now working