Handle more items and better orginazation