new, updated and bug fixed fisink