Copied Andre's changes from local_store after I created the branch