[FIX] other stuff. I should not work on weekends...