ALL new cleaned up js