Improved  list design