Removed nonsense, added fresh, new code