Moved connection to parent, fixed filecount