not sure if this is working
removed needless diff stuff