Not sure. Refactoring mostly? Anyway, I just want to have this remote