rebuilt with @DBFocus added!