@database: It's much better