almaost have two way patches working