Getting ready for DB
Fixed merge