some tweaks and added the list just to store it somewhere