Added a few more pieces of the puzzle