finished 3.5
fixed 3.2 nullpointerexception