some quick hacks, added feature 7001