Some refactoring and now possible to pickup items
Merge