using old fit-routine