upadated version 6.0 without table