some bad import fix and a little add on!