i think this is good for now... #230
updating #239