replaceing with my own code now