second commit, change to NON-fluid