better cost handling