imports
remove useless line
Merge branch 'master' into day
fetch hashmap first
actually return