Make it work ... (needs to synchronize with DB and some small fix...)