Amended according to the changes in fs