dont need anymore
ocd fix?
add gwd support