updated after more tests