Lates changes, src and tests