Rogelio's work/ i will give updated DB asap