Added new Robber features but its buggy
Merging