Change logic to look at current directory