Chaning Map Repo Funtion Order