Update: main working