OK now should work without DB