better user logic
better instance lookup logic