change solution to connect DB