some more tweaking, porting to my laptop