Even smarter (without bugs,mainly :P)