grr
moved some functiond to another file