UPDATED TODO (Bug fixing time)