Make it work for personal setup