Changed it into using place database