Added notifs and custom sql