Made code a bit clearer....
added a dependency for item and location