Miniml working production code
Fix something in production